From 6793f772fc57ecb587925e1e0c845a29503356c4 Mon Sep 17 00:00:00 2001 From: Jonathan Blandford Date: Sat, 8 Dec 2001 20:14:15 +0000 Subject: [PATCH] Add debug spew to lots of places, so that people with crashy trees can Sat Dec 8 10:04:54 2001 Jonathan Blandford * gtk/gtkrbtree.c (_gtk_rbtree_debug_spew): Add debug spew to lots of places, so that people with crashy trees can just run their program with GTK_DEBUG=TREE. --- ChangeLog | 10 ++++++++-- ChangeLog.pre-2-0 | 10 ++++++++-- ChangeLog.pre-2-10 | 10 ++++++++-- ChangeLog.pre-2-2 | 10 ++++++++-- ChangeLog.pre-2-4 | 10 ++++++++-- ChangeLog.pre-2-6 | 10 ++++++++-- ChangeLog.pre-2-8 | 10 ++++++++-- gtk/gtkrbtree.c | 36 +++++++++++++++++++++++++++++++----- 8 files changed, 87 insertions(+), 19 deletions(-) diff --git a/ChangeLog b/ChangeLog index 894f2c7176..c5f4f615e4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sat Dec 8 10:04:54 2001 Jonathan Blandford + + * gtk/gtkrbtree.c (_gtk_rbtree_debug_spew): Add debug spew to lots + of places, so that people with crashy trees can just run their + program with GTK_DEBUG=TREE. + Sat Dec 8 20:57:24 2001 Kristian Rietveld * gtk/gtkliststore.c (gtk_list_store_remove): nuke the stamp++, @@ -8,7 +14,7 @@ Sat Dec 8 20:57:24 2001 Kristian Rietveld * tests/testgtk.c (layout_expose_handler): Don't return TRUE since then the default GtkLayout expose handler won't be called. -Fri Dec 7 23:42:50 2001 Jonathan Blandford +Fri Dec 7 23:42:50 2001 Jonathan Blandford * gtk/gtktreeview.c (validate_rows_handler): remove g_return_if_fail. @@ -6117,7 +6123,7 @@ Fri Jun 29 22:13:28 2001 Jonathan Blandford s/g_signal_newc/g_signal_new/, s/g_signal_disconnect_by_func/g_signal_handlers_disconnect_by_func/) -Fri Jun 29 03:14:16 2001 Jonathan Blandford +Fri Jun 29 03:14:16 2001 Jonathan Blandford * gtk/gtktreeselection.c (gtk_tree_selection_selected_foreach): add path argument to selection callbacks. diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 894f2c7176..c5f4f615e4 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +Sat Dec 8 10:04:54 2001 Jonathan Blandford + + * gtk/gtkrbtree.c (_gtk_rbtree_debug_spew): Add debug spew to lots + of places, so that people with crashy trees can just run their + program with GTK_DEBUG=TREE. + Sat Dec 8 20:57:24 2001 Kristian Rietveld * gtk/gtkliststore.c (gtk_list_store_remove): nuke the stamp++, @@ -8,7 +14,7 @@ Sat Dec 8 20:57:24 2001 Kristian Rietveld * tests/testgtk.c (layout_expose_handler): Don't return TRUE since then the default GtkLayout expose handler won't be called. -Fri Dec 7 23:42:50 2001 Jonathan Blandford +Fri Dec 7 23:42:50 2001 Jonathan Blandford * gtk/gtktreeview.c (validate_rows_handler): remove g_return_if_fail. @@ -6117,7 +6123,7 @@ Fri Jun 29 22:13:28 2001 Jonathan Blandford s/g_signal_newc/g_signal_new/, s/g_signal_disconnect_by_func/g_signal_handlers_disconnect_by_func/) -Fri Jun 29 03:14:16 2001 Jonathan Blandford +Fri Jun 29 03:14:16 2001 Jonathan Blandford * gtk/gtktreeselection.c (gtk_tree_selection_selected_foreach): add path argument to selection callbacks. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 894f2c7176..c5f4f615e4 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Sat Dec 8 10:04:54 2001 Jonathan Blandford + + * gtk/gtkrbtree.c (_gtk_rbtree_debug_spew): Add debug spew to lots + of places, so that people with crashy trees can just run their + program with GTK_DEBUG=TREE. + Sat Dec 8 20:57:24 2001 Kristian Rietveld * gtk/gtkliststore.c (gtk_list_store_remove): nuke the stamp++, @@ -8,7 +14,7 @@ Sat Dec 8 20:57:24 2001 Kristian Rietveld * tests/testgtk.c (layout_expose_handler): Don't return TRUE since then the default GtkLayout expose handler won't be called. -Fri Dec 7 23:42:50 2001 Jonathan Blandford +Fri Dec 7 23:42:50 2001 Jonathan Blandford * gtk/gtktreeview.c (validate_rows_handler): remove g_return_if_fail. @@ -6117,7 +6123,7 @@ Fri Jun 29 22:13:28 2001 Jonathan Blandford s/g_signal_newc/g_signal_new/, s/g_signal_disconnect_by_func/g_signal_handlers_disconnect_by_func/) -Fri Jun 29 03:14:16 2001 Jonathan Blandford +Fri Jun 29 03:14:16 2001 Jonathan Blandford * gtk/gtktreeselection.c (gtk_tree_selection_selected_foreach): add path argument to selection callbacks. diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 894f2c7176..c5f4f615e4 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +Sat Dec 8 10:04:54 2001 Jonathan Blandford + + * gtk/gtkrbtree.c (_gtk_rbtree_debug_spew): Add debug spew to lots + of places, so that people with crashy trees can just run their + program with GTK_DEBUG=TREE. + Sat Dec 8 20:57:24 2001 Kristian Rietveld * gtk/gtkliststore.c (gtk_list_store_remove): nuke the stamp++, @@ -8,7 +14,7 @@ Sat Dec 8 20:57:24 2001 Kristian Rietveld * tests/testgtk.c (layout_expose_handler): Don't return TRUE since then the default GtkLayout expose handler won't be called. -Fri Dec 7 23:42:50 2001 Jonathan Blandford +Fri Dec 7 23:42:50 2001 Jonathan Blandford * gtk/gtktreeview.c (validate_rows_handler): remove g_return_if_fail. @@ -6117,7 +6123,7 @@ Fri Jun 29 22:13:28 2001 Jonathan Blandford s/g_signal_newc/g_signal_new/, s/g_signal_disconnect_by_func/g_signal_handlers_disconnect_by_func/) -Fri Jun 29 03:14:16 2001 Jonathan Blandford +Fri Jun 29 03:14:16 2001 Jonathan Blandford * gtk/gtktreeselection.c (gtk_tree_selection_selected_foreach): add path argument to selection callbacks. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 894f2c7176..c5f4f615e4 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Sat Dec 8 10:04:54 2001 Jonathan Blandford + + * gtk/gtkrbtree.c (_gtk_rbtree_debug_spew): Add debug spew to lots + of places, so that people with crashy trees can just run their + program with GTK_DEBUG=TREE. + Sat Dec 8 20:57:24 2001 Kristian Rietveld * gtk/gtkliststore.c (gtk_list_store_remove): nuke the stamp++, @@ -8,7 +14,7 @@ Sat Dec 8 20:57:24 2001 Kristian Rietveld * tests/testgtk.c (layout_expose_handler): Don't return TRUE since then the default GtkLayout expose handler won't be called. -Fri Dec 7 23:42:50 2001 Jonathan Blandford +Fri Dec 7 23:42:50 2001 Jonathan Blandford * gtk/gtktreeview.c (validate_rows_handler): remove g_return_if_fail. @@ -6117,7 +6123,7 @@ Fri Jun 29 22:13:28 2001 Jonathan Blandford s/g_signal_newc/g_signal_new/, s/g_signal_disconnect_by_func/g_signal_handlers_disconnect_by_func/) -Fri Jun 29 03:14:16 2001 Jonathan Blandford +Fri Jun 29 03:14:16 2001 Jonathan Blandford * gtk/gtktreeselection.c (gtk_tree_selection_selected_foreach): add path argument to selection callbacks. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 894f2c7176..c5f4f615e4 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Sat Dec 8 10:04:54 2001 Jonathan Blandford + + * gtk/gtkrbtree.c (_gtk_rbtree_debug_spew): Add debug spew to lots + of places, so that people with crashy trees can just run their + program with GTK_DEBUG=TREE. + Sat Dec 8 20:57:24 2001 Kristian Rietveld * gtk/gtkliststore.c (gtk_list_store_remove): nuke the stamp++, @@ -8,7 +14,7 @@ Sat Dec 8 20:57:24 2001 Kristian Rietveld * tests/testgtk.c (layout_expose_handler): Don't return TRUE since then the default GtkLayout expose handler won't be called. -Fri Dec 7 23:42:50 2001 Jonathan Blandford +Fri Dec 7 23:42:50 2001 Jonathan Blandford * gtk/gtktreeview.c (validate_rows_handler): remove g_return_if_fail. @@ -6117,7 +6123,7 @@ Fri Jun 29 22:13:28 2001 Jonathan Blandford s/g_signal_newc/g_signal_new/, s/g_signal_disconnect_by_func/g_signal_handlers_disconnect_by_func/) -Fri Jun 29 03:14:16 2001 Jonathan Blandford +Fri Jun 29 03:14:16 2001 Jonathan Blandford * gtk/gtktreeselection.c (gtk_tree_selection_selected_foreach): add path argument to selection callbacks. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 894f2c7176..c5f4f615e4 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Sat Dec 8 10:04:54 2001 Jonathan Blandford + + * gtk/gtkrbtree.c (_gtk_rbtree_debug_spew): Add debug spew to lots + of places, so that people with crashy trees can just run their + program with GTK_DEBUG=TREE. + Sat Dec 8 20:57:24 2001 Kristian Rietveld * gtk/gtkliststore.c (gtk_list_store_remove): nuke the stamp++, @@ -8,7 +14,7 @@ Sat Dec 8 20:57:24 2001 Kristian Rietveld * tests/testgtk.c (layout_expose_handler): Don't return TRUE since then the default GtkLayout expose handler won't be called. -Fri Dec 7 23:42:50 2001 Jonathan Blandford +Fri Dec 7 23:42:50 2001 Jonathan Blandford * gtk/gtktreeview.c (validate_rows_handler): remove g_return_if_fail. @@ -6117,7 +6123,7 @@ Fri Jun 29 22:13:28 2001 Jonathan Blandford s/g_signal_newc/g_signal_new/, s/g_signal_disconnect_by_func/g_signal_handlers_disconnect_by_func/) -Fri Jun 29 03:14:16 2001 Jonathan Blandford +Fri Jun 29 03:14:16 2001 Jonathan Blandford * gtk/gtktreeselection.c (gtk_tree_selection_selected_foreach): add path argument to selection callbacks. diff --git a/gtk/gtkrbtree.c b/gtk/gtkrbtree.c index e40c8d1ed3..6f9b94dbee 100644 --- a/gtk/gtkrbtree.c +++ b/gtk/gtkrbtree.c @@ -562,6 +562,13 @@ _gtk_rbtree_insert_after (GtkRBTree *tree, GtkRBNode *tmp_node; GtkRBTree *tmp_tree; + if (gtk_debug_flags & GTK_DEBUG_TREE) + { + g_print ("_gtk_rbtree_insert_after: 0x%x\n", (gint) current); + _gtk_rbtree_debug_spew (tree); + _gtk_rbtree_test (G_STRLOC, tree); + } + if (current != NULL && current->right != tree->nil) { current = current->right; @@ -615,7 +622,11 @@ _gtk_rbtree_insert_after (GtkRBTree *tree, _gtk_rbtree_insert_fixup (tree, node); if (gtk_debug_flags & GTK_DEBUG_TREE) - _gtk_rbtree_test (G_STRLOC, tree); + { + g_print ("_gtk_rbtree_insert_after finished...\n\n\n"); + _gtk_rbtree_debug_spew (tree); + _gtk_rbtree_test (G_STRLOC, tree); + } return node; } @@ -631,6 +642,13 @@ _gtk_rbtree_insert_before (GtkRBTree *tree, GtkRBNode *tmp_node; GtkRBTree *tmp_tree; + if (gtk_debug_flags & GTK_DEBUG_TREE) + { + g_print ("_gtk_rbtree_insert_before: 0x%x\n", (gint) current); + _gtk_rbtree_debug_spew (tree); + _gtk_rbtree_test (G_STRLOC, tree); + } + if (current != NULL && current->left != tree->nil) { current = current->left; @@ -685,7 +703,11 @@ _gtk_rbtree_insert_before (GtkRBTree *tree, _gtk_rbtree_insert_fixup (tree, node); if (gtk_debug_flags & GTK_DEBUG_TREE) - _gtk_rbtree_test (G_STRLOC, tree); + { + g_print ("_gtk_rbtree_insert_before finished...\n\n\n"); + _gtk_rbtree_debug_spew (tree); + _gtk_rbtree_test (G_STRLOC, tree); + } return node; } @@ -1157,6 +1179,7 @@ _gtk_rbtree_remove_node (GtkRBTree *tree, if (gtk_debug_flags & GTK_DEBUG_TREE) { + g_print ("_gtk_rbtree_remove_node: 0x%x\n", (gint) node); _gtk_rbtree_debug_spew (tree); _gtk_rbtree_test (G_STRLOC, tree); } @@ -1295,6 +1318,7 @@ _gtk_rbtree_remove_node (GtkRBTree *tree, { _gtk_rbtree_debug_spew (tree); _gtk_rbtree_test (G_STRLOC, tree); + g_print ("_gtk_rbtree_remove_node finished...\n\n\n"); } } @@ -1725,9 +1749,11 @@ _gtk_rbtree_debug_spew_helper (GtkRBTree *tree, for (i = 0; i < depth; i++) g_print ("\t"); - g_print ("(%x - %s) %d%d%d\n", + g_print ("(0x%x - %s) (Offset %d) (Parity %d) (Validity %d%d%d)\n", (gint) node, (GTK_RBNODE_GET_COLOR (node) == GTK_RBNODE_BLACK)?"BLACK":" RED ", + node->offset, + node->parity?1:0, (GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_DESCENDANTS_INVALID))?1:0, (GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_INVALID))?1:0, (GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_COLUMN_INVALID))?1:0); @@ -1742,7 +1768,7 @@ _gtk_rbtree_debug_spew (GtkRBTree *tree) { g_return_if_fail (tree != NULL); - g_print ("=====\n"); + g_print ("==\n"); _gtk_rbtree_debug_spew_helper (tree, tree->root, 0); - g_print ("=====\n\n\n"); + g_print ("==\n\n\n"); } -- 2.30.2